From 381f1cdd8c722527e8f98cc59cc6becf1866a47e Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 6 Nov 2000 13:19:38 +0000 Subject: [PATCH] (vc-insert-file): Don't assume byte==char. --- lisp/vc-hooks.el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el index 7af6c735c97..a91f76740d3 100644 --- a/lisp/vc-hooks.el +++ b/lisp/vc-hooks.el @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel -;; $Id: vc-hooks.el,v 1.126 2000/10/27 13:26:18 spiegel Exp $ +;; $Id: vc-hooks.el,v 1.127 2000/11/04 18:24:50 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -215,15 +215,12 @@ exists and its contents were successfully inserted." (if (not limit) (insert-file-contents file) (if (not blocksize) (setq blocksize 8192)) - (let (found s) - (while (not found) - (setq s (buffer-size)) - (goto-char (1+ s)) - (setq found - (or (zerop (cadr (insert-file-contents - file nil s (+ s blocksize)))) - (progn (beginning-of-line) - (re-search-forward limit nil t))))))) + (let ((filepos 0)) + (while + (and (< 0 (cadr (insert-file-contents + file nil filepos (incf filepos blocksize)))) + (progn (beginning-of-line) + (not (re-search-forward limit nil 'move))))))) (set-buffer-modified-p nil) t)) -- 2.30.2